expander: Fix pressed_in_title check

gesture coords are relative to the expander widget, the title allocation
is relative to the box child.

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 711be4c63ee0af8f8a833c1fe6db5196ae93fbe5..12f81914303caa796d54e0f561503650234a9cca 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -545,20 +545,16 @@ gesture_multipress_pressed_cb (GtkGestureMultiPress *gesture,
                                GtkExpander          *expander)
 {
   GtkExpanderPrivate *priv = expander->priv;
-  GtkAllocation title_allocation, allocation;
+  GtkAllocation title_allocation;
 
-  gtk_widget_get_allocation (GTK_WIDGET (expander), &allocation);
-  gtk_widget_get_allocation (priv->title_widget, &title_allocation);
+  gtk_widget_get_own_allocation (priv->title_widget, &title_allocation);
+  gtk_widget_translate_coordinates (priv->title_widget, GTK_WIDGET (expander),
+                                    title_allocation.x, title_allocation.y,
+                                    &title_allocation.x, &title_allocation.y);
   /* Coordinates are in the widget coordinate system, so transform
    * the title_allocation to it.
    */
-  title_allocation.x -= allocation.x;
-  title_allocation.y -= allocation.y;
-
-  priv->pressed_in_title = (x >= title_allocation.x &&
-                            x < title_allocation.x + title_allocation.width &&
-                            y >= title_allocation.y &&
-                            y < title_allocation.y + title_allocation.height);
+  priv->pressed_in_title = gdk_rectangle_contains_point (&title_allocation, x, y);
 }
 
 static void